From c6d786bfd027f2aa35eb34b9c97f5b35de55316a Mon Sep 17 00:00:00 2001 From: "chris@kneesaa.uk.xensource.com" Date: Wed, 9 Aug 2006 21:33:59 +0100 Subject: [PATCH] [qemu] Move acpi to devfn 2, so that it matches the fadt. Based on feedback from: Wang, Winston L Signed-off-by: Christian Limpach --- tools/firmware/acpi/acpi_fadt.h | 3 +-- tools/ioemu/hw/pc.c | 13 +++++-------- tools/ioemu/hw/piix4acpi.c | 4 ++-- tools/ioemu/vl.h | 3 +++ 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/tools/firmware/acpi/acpi_fadt.h b/tools/firmware/acpi/acpi_fadt.h index 3c8ef4e25a..d1ecea5588 100644 --- a/tools/firmware/acpi/acpi_fadt.h +++ b/tools/firmware/acpi/acpi_fadt.h @@ -59,8 +59,7 @@ #define ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID ACPI_SYSTEM_IO #define ACPI_PM1A_EVT_BLK_BIT_WIDTH 0x20 #define ACPI_PM1A_EVT_BLK_BIT_OFFSET 0x00 -//#define ACPI_PM1A_EVT_BLK_ADDRESS 0x000000000000c010 -#define ACPI_PM1A_EVT_BLK_ADDRESS 0x000000000000c040 +#define ACPI_PM1A_EVT_BLK_ADDRESS 0x000000000000c010 // // PM1B Event Register Block Generic Address Information diff --git a/tools/ioemu/hw/pc.c b/tools/ioemu/hw/pc.c index 70cf09064f..45acc68dda 100644 --- a/tools/ioemu/hw/pc.c +++ b/tools/ioemu/hw/pc.c @@ -572,9 +572,6 @@ static int serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 }; static int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc }; static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 }; -/* PIIX4 acpi pci configuration space, func 3 */ -extern void pci_piix4_acpi_init(PCIBus *bus, int devfn); - #ifdef HAS_AUDIO static void audio_init (PCIBus *pci_bus) { @@ -877,13 +874,13 @@ static void pc_init1(uint64_t ram_size, int vga_ram_size, int boot_device, cmos_init(ram_size, boot_device, bs_table, timeoffset); - if (pci_enabled && usb_enabled) { - usb_uhci_init(pci_bus, piix3_devfn + 2); - } - /* using PIIX4 acpi model */ if (pci_enabled && acpi_enabled) - pci_piix4_acpi_init(pci_bus, piix3_devfn + (usb_enabled ? 3 : 2)); + pci_piix4_acpi_init(pci_bus, piix3_devfn + 2); + + if (pci_enabled && usb_enabled) { + usb_uhci_init(pci_bus, piix3_devfn + (acpi_enabled ? 3 : 2)); + } #ifndef CONFIG_DM if (pci_enabled && acpi_enabled) { diff --git a/tools/ioemu/hw/piix4acpi.c b/tools/ioemu/hw/piix4acpi.c index 1426447f9b..7b75d01c64 100644 --- a/tools/ioemu/hw/piix4acpi.c +++ b/tools/ioemu/hw/piix4acpi.c @@ -374,13 +374,13 @@ static void acpi_map(PCIDevice *pci_dev, int region_num, register_ioport_read(addr + 8, 4, 4, acpiPm1Timer_readl, d); } -/* PIIX4 acpi pci configuration space, func 3 */ +/* PIIX4 acpi pci configuration space, func 2 */ void pci_piix4_acpi_init(PCIBus *bus, int devfn) { PCIAcpiState *d; uint8_t *pci_conf; - /* register a function devfn of PIIX4 */ + /* register a function 2 of PIIX4 */ d = (PCIAcpiState *)pci_register_device( bus, "PIIX4 ACPI", sizeof(PCIAcpiState), devfn, NULL, NULL); diff --git a/tools/ioemu/vl.h b/tools/ioemu/vl.h index 7ed39bfcf6..37b42e2db2 100644 --- a/tools/ioemu/vl.h +++ b/tools/ioemu/vl.h @@ -925,6 +925,9 @@ extern int acpi_enabled; void piix4_pm_init(PCIBus *bus, int devfn); void acpi_bios_init(void); +/* piix4acpi.c */ +extern void pci_piix4_acpi_init(PCIBus *bus, int devfn); + /* pc.c */ extern QEMUMachine pc_machine; extern QEMUMachine isapc_machine; -- 2.30.2